From 1c29241d42a835fa9d6cc93a174e7de1dadbe871 Mon Sep 17 00:00:00 2001
From: "kaf24@scramble.cl.cam.ac.uk" <kaf24@scramble.cl.cam.ac.uk>
Date: Mon, 16 Aug 2004 18:08:43 +0000
Subject: [PATCH] bitkeeper revision 1.1159.34.2
 (4120f82bRcTbpXEs-zb6q77ty9n_Ig)

Add debugging to the new mmap() failure path.
---
 linux-2.6.7-xen-sparse/arch/xen/i386/mm/mmap.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/linux-2.6.7-xen-sparse/arch/xen/i386/mm/mmap.c b/linux-2.6.7-xen-sparse/arch/xen/i386/mm/mmap.c
index d3ffc00d9c..b55742967e 100644
--- a/linux-2.6.7-xen-sparse/arch/xen/i386/mm/mmap.c
+++ b/linux-2.6.7-xen-sparse/arch/xen/i386/mm/mmap.c
@@ -27,7 +27,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
 	start_addr = addr = mm->free_area_cache;
 #else
-	addr = PAGE_ALIGN(TASK_UNMAPPED_BASE);
+	start_addr = addr = PAGE_ALIGN(TASK_UNMAPPED_BASE);
 #endif
 
 full_search:
@@ -61,7 +61,10 @@ unsigned long
 arch_check_fixed_mapping(struct file *filp, unsigned long addr,
 		unsigned long len, unsigned long pgoff, unsigned long flags)
 {
-	if ( addr < (FIRST_USER_PGD_NR<<PGDIR_SHIFT) )
+	if (addr < (FIRST_USER_PGD_NR<<PGDIR_SHIFT)) {
+		printk(KERN_ALERT "WARNING: Preventing a mmap() request by %s at 0x%08lx, len %08lx\n",
+		current->comm, addr, len);
 		return -EINVAL;
+	}
 	return 0;
 }
-- 
2.30.2